<<<<<<< .mine
/********************************************************************************
** Form generated from reading UI file 'canvas.ui'
**
** Created: Sat Nov 13 13:57:48 2010
**      by: Qt User Interface Compiler version 4.7.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/

#ifndef UI_CANVAS_H
#define UI_CANVAS_H

#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QHeaderView>
#include <QtGui/QWidget>

QT_BEGIN_NAMESPACE

class Ui_Canvas
{
public:

	void setupUi(QWidget *Canvas)
	{
		if (Canvas->objectName().isEmpty())
			Canvas->setObjectName(QString::fromUtf8("Canvas"));
		Canvas->resize(600, 400);

		retranslateUi(Canvas);

		QMetaObject::connectSlotsByName(Canvas);
	} // setupUi

	void retranslateUi(QWidget *Canvas)
	{
		Canvas->setWindowTitle(QApplication::translate("Canvas", "Canvas", 0, QApplication::UnicodeUTF8));
	} // retranslateUi

};

namespace Ui {
	class Canvas: public Ui_Canvas {};
} // namespace Ui

QT_END_NAMESPACE

#endif // UI_CANVAS_H
=======
/********************************************************************************
** Form generated from reading UI file 'canvas.ui'
**
** Created: Sun Jul 11 15:01:59 2010
**      by: Qt User Interface Compiler version 4.6.3
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/

#ifndef UI_CANVAS_H
#define UI_CANVAS_H

#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QHeaderView>
#include <QtGui/QWidget>

QT_BEGIN_NAMESPACE

class Ui_Canvas
{
public:

    void setupUi(QWidget *Canvas)
    {
        if (Canvas->objectName().isEmpty())
            Canvas->setObjectName(QString::fromUtf8("Canvas"));
        Canvas->resize(600, 400);

        retranslateUi(Canvas);

        QMetaObject::connectSlotsByName(Canvas);
    } // setupUi

    void retranslateUi(QWidget *Canvas)
    {
        Canvas->setWindowTitle(QApplication::translate("Canvas", "Canvas", 0, QApplication::UnicodeUTF8));
    } // retranslateUi

};

namespace Ui {
    class Canvas: public Ui_Canvas {};
} // namespace Ui

QT_END_NAMESPACE

#endif // UI_CANVAS_H
>>>>>>> .r4
